8000 Merge pull request #19442 from jakobjakobson13/Use_with_open · numpy/numpy@df9c973 · GitHub
[go: up one dir, main page]
Skip to content

Commit df9c973

Browse files
charrischarris
authored
Merge pull request #19442 from jakobjakobson13/Use_with_open
MAINT: Use "with open(...)"
2 parents b32b72e + aaa9214 commit df9c973

File tree

2 files changed

+35
-39
lines changed

2 files changed

+35
-39
lines changed

‎numpy/_version.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,20 @@ def git_get_keywords(versionfile_abs):
135135
# _version.py.
136136
keywords = {}
137137
try:
138-
f = open(versionfile_abs, "r")
139-
for line in f.readlines():
140-
if line.strip().startswith("git_refnames ="):
141-
mo = re.search(r'=\s*"(.*)"', line)
142-
if mo:
143-
keywords["refnames"] = mo.group(1)
144-
if line.strip().startswith("git_full ="):
145-
mo = re.search(r'=\s*"(.*)"', line)
146-
if mo:
147-
keywords["full"] = mo.group(1)
148-
if line.strip().startswith("git_date ="):
149-
mo = re.search(r'=\s*"(.*)"', line)
150-
if mo:
151-
keywords["date"] = mo.group(1)
152-
f.close()
138+
with open(versionfile_abs, "r") as f:
139+
for line in f.readlines():
140+
if line.strip().startswith("git_refnames ="):
141+
mo = re.search(r'=\s*"(.*)"', line)
142+
if mo:
143+
keywords["refnames"] = mo.group(1)
144+
if line.strip().startswith("git_full ="):
145+
mo = re.search(r'=\s*"(.*)"', line)
146+
if mo:
147+
keywords["full"] = mo.group(1)
148+
if line.strip().startswith("git_date ="):
149+
mo = re.search(r'=\s*"(.*)"', line)
150+
if mo:
151+
keywords["date"] = mo.group(1)
153152
except EnvironmentError:
154153
pass
155154
return keywords

‎versioneer.py

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -946,21 +946,20 @@ def git_get_keywords(versionfile_abs):
946946
# _version.py.
947947
keywords = {}
948948
try:
949-
f = open(versionfile_abs, "r")
950-
for line in f.readlines():
951-
if line.strip().startswith("git_refnames ="):
952-
mo = re.search(r'=\s*"(.*)"', line)
953-
if mo:
954-
keywords["refnames"] = mo.group(1)
955-
if line.strip().startswith("git_full ="):
956-
mo = re.search(r'=\s*"(.*)"', line)
957-
if mo:
958-
keywords["full"] = mo.group(1)
959-
if line.strip().startswith("git_date ="):
960-
mo = re.search(r'=\s*"(.*)"', line)
961-
if mo:
962-
keywords["date"] = mo.group(1)
963-
f.close()
949+
with open(versionfile_abs, "r") as f:
950+
for line in f.readlines():
951+
if line.strip().startswith("git_refnames ="):
952+
mo = re.search(r'=\s*"(.*)"', line)
953+
if mo:
954+
keywords["refnames"] = mo.group(1)
955+
if line.strip().startswith("git_full ="):
956+
mo = re.search(r'=\s*"(.*)"', line)
957+
if mo:
958+
keywords["full"] = mo.group(1)
959+
if line.strip().startswith("git_date ="):
960+
mo = re.search(r'=\s*"(.*)"', line)
961+
if mo:
962+
keywords["date"] = mo.group(1)
964963
except EnvironmentError:
965964
pass
966965
return keywords
@@ -1142,18 +1141,16 @@ def do_vcs_install(manifest_in, versionfile_source, ipy):
11421141
files.append(versioneer_file)
11431142
present = False
11441143
try:
1145-
f = open(".gitattributes", "r")
1146-
for line in f.readlines():
1147-
if line.strip().startswith(versionfile_source):
1148-
if "export-subst" in line.strip().split()[1:]:
1149-
present = True
1150-
f.close()
1144+
with open(".gitattributes", "r") as f:
1145+
for line in f.readlines():
1146+
if line.strip().startswith(versionfile_source):
1147+
if "export-subst" in line.strip().split()[1:]:
1148+
present = True
11511149
except EnvironmentError:
11521150
pass
11531151
if not present:
1154-
f = open(".gitattributes", "a+")
1155-
f.write("%s export-subst\n" % versionfile_source)
1156-
f.close()
1152+
with open(".gitattributes", "a+") as f:
1153+
f.write("%s export-subst\n" % versionfile_source)
11571154
files.append(".gitattributes")
11581155
run_command(GITS, ["add", "--"] + files)
11591156

0 commit comments

Comments
 (0)
0