Replace with statement with a try/except/else/finally block to narrow down problem in the future

This commit is contained in:
kxrd 2017-06-13 22:22:27 +02:00
parent 54be2d1c24
commit e7b8ddf72d

View File

@ -244,11 +244,14 @@ def parse_requirements(file_):
delim = ["<", ">", "=", "!", "~"] # https://www.python.org/dev/peps/pep-0508/#complete-grammar delim = ["<", ">", "=", "!", "~"] # https://www.python.org/dev/peps/pep-0508/#complete-grammar
try: try:
with open(file_, "r") as f: f = open_func(file_, "r")
data = [x.strip() for x in f.readlines() if x != "\n"]
except OSError: except OSError:
logging.error("Failed on file: {}".format(file_)) logging.error("Failed on file: {}".format(file_))
raise raise
else:
data = [x.strip() for x in f.readlines() if x != "\n"]
finally:
f.close()
data = [x for x in data if x[0].isalpha()] data = [x for x in data if x[0].isalpha()]
@ -303,16 +306,22 @@ def clean(file_, imports):
re_remove = re.compile("|".join(modules_not_imported)) re_remove = re.compile("|".join(modules_not_imported))
to_write = [] to_write = []
with open(file_, "r+") as f: try:
f = open_func(file_, "r+")
except OSError:
logging.error("Failed on file: {}".format(file_))
raise
else:
for i in f.readlines(): for i in f.readlines():
if re_remove.match(i) is None: if re_remove.match(i) is None:
to_write.append(i) to_write.append(i)
f.seek(0) f.seek(0)
f.truncate() f.truncate()
for i in to_write: for i in to_write:
f.write(i) f.write(i)
finally:
f.close()
logging.info("Successfully cleaned up requirements in " + file_) logging.info("Successfully cleaned up requirements in " + file_)