Merge branch 'FredrikHson-master'

This commit is contained in:
Chiel ten Brinke 2016-09-08 18:17:45 +02:00
commit 8a793f3f1d

View File

@ -186,7 +186,11 @@ if int(vim.eval('exists("g:formatterpath")')):
# When an entry is unicode, Popen can't deal with it in Python 2. # When an entry is unicode, Popen can't deal with it in Python 2.
# As a pragmatic fix, we'll omit that entry. # As a pragmatic fix, we'll omit that entry.
env = {key : val for key, val in env.iteritems() if type(key) == type(val) == str} newenv = {}
for key,val in env.iteritems():
if type(key) == type(val) == str:
newenv[key] = val
env=newenv
p = subprocess.Popen(formatprg, env=env, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE) p = subprocess.Popen(formatprg, env=env, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE)
stdoutdata, stderrdata = p.communicate(text) stdoutdata, stderrdata = p.communicate(text)