summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael DeHaan <michael.dehaan@gmail.com>2013-11-25 08:28:14 -0800
committerMichael DeHaan <michael.dehaan@gmail.com>2013-11-25 08:28:14 -0800
commit41e83d9df1ccbfa04c13041bc2340eb02d05840f (patch)
tree0a1aa87ae6a4d5c0da426178babfe3496bbf7aa0
parentb8146e3bc73d779b6e5ddf103d78a55680705637 (diff)
parent9c798b119c012ad8cacced0b80f988d24d9d2ae0 (diff)
downloadansible-41e83d9df1ccbfa04c13041bc2340eb02d05840f.tar.gz
Merge pull request #5045 from junegunn/wait_for-python2.4
Remove Python 2.4-incompatible 'with' statement
-rw-r--r--library/utilities/wait_for5
1 files changed, 4 insertions, 1 deletions
diff --git a/library/utilities/wait_for b/library/utilities/wait_for
index 8644673eb5..a175afc415 100644
--- 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