vim/gundo.vim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Send strings to difflib.unified_diff

Browse Source 
Python 3.5 adds type-checking to difflib, which causes gundo to fail.
This fixes the issue by converting the arguments to strings.
See https://bugs.python.org/issue17445 for details
This commit is contained in:
Omar Khan 2015-10-07 10:34:15 +07:00
parent 3975ac8715
commit d8ea993adc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autoload/gundo.py
View File

@ -361,7 +361,7 @@ def _generate_preview_diff(current, node_before, node_after):
before_name = 'Original' before_name = 'Original'
before_time = '' before_time = ''
after_name = node_after.n after_name = str(node_after.n)
after_time = _fmt_time(node_after.time) after_time = _fmt_time(node_after.time)
else: else:
_undo_to(node_before.n) _undo_to(node_before.n)
@ -370,9 +370,9 @@ def _generate_preview_diff(current, node_before, node_after):
_undo_to(node_after.n) _undo_to(node_after.n)
after_lines = vim.current.buffer[:] after_lines = vim.current.buffer[:]
before_name = node_before.n before_name = str(node_before.n)
before_time = _fmt_time(node_before.time) before_time = _fmt_time(node_before.time)
after_name = node_after.n after_name = str(node_after.n)
after_time = _fmt_time(node_after.time) after_time = _fmt_time(node_after.time)
_undo_to(current) _undo_to(current)
@ -390,9 +390,9 @@ def _generate_change_preview_diff(current, node_before, node_after):
_undo_to(node_after.n) _undo_to(node_after.n)
after_lines = vim.current.buffer[:] after_lines = vim.current.buffer[:]
before_name = node_before.n or 'Original' before_name = str(node_before.n or 'Original')
before_time = node_before.time and _fmt_time(node_before.time) or '' before_time = node_before.time and _fmt_time(node_before.time) or ''
after_name = node_after.n or 'Original' after_name = str(node_after.n or 'Original')
after_time = node_after.time and _fmt_time(node_after.time) or '' after_time = node_after.time and _fmt_time(node_after.time) or ''
_undo_to(current) _undo_to(current)