UltiSnips/all.snippets

@@ -5,7 +5,7 @@ Kenneth Benzie (Benie) <k.benzie83@gmail.com>
 endsnippet
 
 global !p
-comment=vim.current.buffer.options['commentstring'].decode('utf-8').strip()
+comment=vim.current.buffer.options['commentstring'].strip()
 
 def commentbefore():
 	commentbefore = comment[0:comment.find('%s')].strip()

indent/python.vim

@@ -1,13 +0,0 @@
-" Override default Python indent file
-
-" Make sure lisp indenting doesn't supersede us
-setlocal nolisp
-" indentexpr isn't much help otherwise
-setlocal autoindent
-
-" TODO: Implement an indentexpr for Python which does not crash on macvim
-" 8.1.950 and does not insert 2 tabs when adding a new line in function
-" parameters insert mode. Look at GetPythonIndent in:
-"   <vim>/runtime/indent/python.vim
-setlocal indentexpr=
-setlocal indentkeys+=<:>,=elif,=except