beautify the code as @go2chenhua suggested in issue #156

Yggdroot · May 13, 2018 · fb57fd1 · fb57fd1
1 parent e33e5ff
commit fb57fd1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/autoload/leaderf/python/leaderf/bufTagExpl.py b/autoload/leaderf/python/leaderf/bufTagExpl.py
@@ -105,20 +105,14 @@ def _getTagResult(self, buffer):
         self._executor.append(executor)
         if buffer.options["modified"] == True:
             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
+                tmp_file = partial(tempfile.NamedTemporaryFile, encoding=lfEval("&encoding"))
             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
+                tmp_file = tempfile.NamedTemporaryFile
+
+            with tmp_file(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
@@ -121,20 +121,14 @@ def _getFunctionResult(self, buffer):
         self._executor.append(executor)
         if buffer.options["modified"] == True:
             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
+                tmp_file = partial(tempfile.NamedTemporaryFile, encoding=lfEval("&encoding"))
             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
+                tmp_file = tempfile.NamedTemporaryFile
+
+            with tmp_file(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))