浏览代码

Simplify extra_dependencies() and close open files in read()

cclauss 6 年之前
父节点
当前提交
fef2c05ab5
共有 1 个文件被更改,包括 4 次插入8 次删除
  1. 4 8
      setup.py

+ 4 - 8
setup.py

@@ -7,21 +7,17 @@ import os
 
 def extra_dependencies():
     import sys
-    ret = []
-    if sys.version_info < (2, 7):
-        ret.append('argparse')
-    return ret
-
+    return = ['argparse'] if sys.version_info < (2, 7) else []
 
 def read(*names):
     values = dict()
-    extensions = ['.txt', '.rst']
     for name in names:
         value = ''
-        for extension in extensions:
+        for extension in ('.txt', '.rst'):
             filename = name + extension
             if os.path.isfile(filename):
-                value = open(name + extension).read()
+                with open(filename) as in_file:
+                    value = in_file.read()
                 break
         values[name] = value
     return values