fix issue #156

tempfile.NamedTemporaryFile 缺少 encoding 时出错
Yggdroot · May 13, 2018 · e33e5ff · e33e5ff
1 parent ddfcfe0
commit e33e5ff
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/autoload/leaderf/python/leaderf/bufTagExpl.py b/autoload/leaderf/python/leaderf/bufTagExpl.py
@@ -4,6 +4,7 @@
 import vim
 import re
 import os
+import sys
 import os.path
 import subprocess
 import tempfile
@@ -103,12 +104,21 @@ def _getTagResult(self, buffer):
         executor = AsyncExecutor()
         self._executor.append(executor)
         if buffer.options["modified"] == True:
-            with tempfile.NamedTemporaryFile(mode='w+',
-                                             suffix='_'+os.path.basename(buffer.name),
-                                             delete=False) as f:
-                for line in buffer[:]:
-                    f.write(line + '\n')
-                file_name = f.name
+            if sys.version_info >= (3, 0):
+                with tempfile.NamedTemporaryFile(mode='w+',
+                                                 encoding=lfEval("&encoding"),
+                                                 suffix='_'+os.path.basename(buffer.name),
+                                                 delete=False) as f:
+                    for line in buffer[:]:
+                        f.write(line + '\n')
+                    file_name = f.name
+            else:
+                with tempfile.NamedTemporaryFile(mode='w+',
+                                                 suffix='_'+os.path.basename(buffer.name),
+                                                 delete=False) as f:
+                    for line in buffer[:]:
+                        f.write(line + '\n')
+                    file_name = f.name
             # {tagname}<Tab>{tagfile}<Tab>{tagaddress}[;"<Tab>{tagfield}..]
             # {tagname}<Tab>{tagfile}<Tab>{tagaddress};"<Tab>{kind}<Tab>{scope}
             cmd = '{} -n -u --fields=Ks {} -f- "{}"'.format(self._ctags, extra_options, lfDecode(file_name))

diff --git a/autoload/leaderf/python/leaderf/functionExpl.py b/autoload/leaderf/python/leaderf/functionExpl.py
@@ -4,6 +4,7 @@
 import vim
 import re
 import os
+import sys
 import os.path
 import subprocess
 import tempfile
@@ -119,12 +120,21 @@ def _getFunctionResult(self, buffer):
         executor = AsyncExecutor()
         self._executor.append(executor)
         if buffer.options["modified"] == True:
-            with tempfile.NamedTemporaryFile(mode='w+',
-                                             suffix='_'+os.path.basename(buffer.name),
-                                             delete=False) as f:
-                for line in buffer[:]:
-                    f.write(line + '\n')
-                file_name = f.name
+            if sys.version_info >= (3, 0):
+                with tempfile.NamedTemporaryFile(mode='w+',
+                                                 encoding=lfEval("&encoding"),
+                                                 suffix='_'+os.path.basename(buffer.name),
+                                                 delete=False) as f:
+                    for line in buffer[:]:
+                        f.write(line + '\n')
+                    file_name = f.name
+            else:
+                with tempfile.NamedTemporaryFile(mode='w+',
+                                                 suffix='_'+os.path.basename(buffer.name),
+                                                 delete=False) as f:
+                    for line in buffer[:]:
+                        f.write(line + '\n')
+                    file_name = f.name
             # {tagname}<Tab>{tagfile}<Tab>{tagaddress};"<Tab>{kind}
             cmd = '{} -n -u --fields=k {} -f- "{}"'.format(self._ctags, extra_options, lfDecode(file_name))
             result = executor.execute(cmd, cleanup=partial(os.remove, file_name))