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

Remove Python 2.4-incompatible 'with' statement
12 years ago · 41e83d9df1
parent b8146e3bc7 9c798b119c
commit 41e83d9df1
1 changed files with 4 additions and 1 deletions
--- a/library/utilities/wait_for
+++ b/library/utilities/wait_for
@ -157,7 +157,8 @@ def main():
        while datetime.datetime.now() < end:
            if path:
                try:
-                    with open(path) as f:
+                    f = open(path)
+                    try:
                        if search_regex:
                            if re.search(search_regex, f.read(), re.MULTILINE):
                                break
@ -165,6 +166,8 @@ def main():
                                time.sleep(1)
                        else:
                            break
+                    finally:
+                        f.close()
                except IOError:
                    time.sleep(1)
                    pass