Merge pull request #5045 from junegunn/wait_for-python2.4

Remove Python 2.4-incompatible 'with' statement
reviewable/pr18780/r1
Michael DeHaan 11 years ago
commit 69531deea1

@ -157,7 +157,8 @@ def main():
while datetime.datetime.now() < end: while datetime.datetime.now() < end:
if path: if path:
try: try:
with open(path) as f: f = open(path)
try:
if search_regex: if search_regex:
if re.search(search_regex, f.read(), re.MULTILINE): if re.search(search_regex, f.read(), re.MULTILINE):
break break
@ -165,6 +166,8 @@ def main():
time.sleep(1) time.sleep(1)
else: else:
break break
finally:
f.close()
except IOError: except IOError:
time.sleep(1) time.sleep(1)
pass pass

Loading…
Cancel
Save